From: Kenichi Handa <handa@m17n.org>
Date: Tue, 27 Dec 2011 07:29:06 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1304^2~3
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ac0c42c328b49617048391ee47a476fba6ad5920;p=emacs.git

merge trunk
---

ac0c42c328b49617048391ee47a476fba6ad5920